From e2bfc5ae076d24bf75584028b1d3026ffd8f4d5f Mon Sep 17 00:00:00 2001 From: Alastair Tse Date: Fri, 8 Dec 2006 13:31:21 +0000 Subject: [PATCH] [XEND] Keep vif IP addresses as space separated string. They were inconsistently represented as strings or lists making it difficult to know the type of the IP parameter for vifs. Since both xm and DevController represents these as space separated strings, that is what it will be stored as. Signed-off-by: Alastair Tse --- tools/python/xen/xend/XendConfig.py | 13 ------------- tools/python/xen/xend/server/netif.py | 4 ++-- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/tools/python/xen/xend/XendConfig.py b/tools/python/xen/xend/XendConfig.py index af2971a870..804a50209c 100644 --- a/tools/python/xen/xend/XendConfig.py +++ b/tools/python/xen/xend/XendConfig.py @@ -922,24 +922,11 @@ class XendConfig(dict): except ValueError: pass # SXP has no options for this device - - # Special handling for certain device parameters. - - def _get_config_ipaddr(cfg): - val = [] - for ipaddr in sxp.children(cfg, elt='ip'): - val.append(sxp.child0(ipaddr)) - return val - - if dev_type == 'vif' and 'ip' in dev_info: - dev_info['ip'] = _get_config_ipaddr(config) - if dev_type == 'vbd': if dev_info.get('dev', '').startswith('ioemu:'): dev_info['driver'] = 'ioemu' else: dev_info['driver'] = 'paravirtualised' - # create uuid if it doesn't exist dev_uuid = dev_info.get('uuid', uuid.createString()) diff --git a/tools/python/xen/xend/server/netif.py b/tools/python/xen/xend/server/netif.py index a20929a0d9..8b0a2ce66c 100644 --- a/tools/python/xen/xend/server/netif.py +++ b/tools/python/xen/xend/server/netif.py @@ -164,7 +164,7 @@ class NetifController(DevController): front = { 'handle' : "%i" % devid, 'mac' : mac } if ipaddr: - back['ip'] = ' '.join(ipaddr) + back['ip'] = ipaddr if bridge: back['bridge'] = bridge if vifname: @@ -189,7 +189,7 @@ class NetifController(DevController): network_script_dir = xroot.network_script_dir + os.sep result['script'] = script.replace(network_script_dir, "") if ip: - result['ip'] = ip.split(" ") + result['ip'] = ip if bridge: result['bridge'] = bridge if mac: -- 2.30.2